Bump build version

[rbdr/map] / Map / Presentation / Base Components / MapTextEditor.swift

diff --git a/Map/Presentation/Base Components/MapTextEditor.swift b/Map/Presentation/Base Components/MapTextEditor.swift
index f3838a663aa83d63dc22bf688326b93176a704a5..2e4f279cd3d6ea0266a8d646479b31a1284f6601 100644 (file)
--- a/Map/Presentation/Base Components/MapTextEditor.swift
+++ b/Map/Presentation/Base Components/MapTextEditor.swift
@@ -1,9 +1,36 @@
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Cocoa
 import SwiftUI
 
 class MapTextEditorController: NSViewController {
 
 import Cocoa
 import SwiftUI
 
 class MapTextEditorController: NSViewController {
 

-  @Binding var text: String
+  @Binding var document: MapDocument
+  var highlightRanges: [Range<String.Index>] {
+    didSet {
+      updateHighlights()
+    }
+  }
+
+  var selectedRange: Int {
+    didSet {
+      updateHighlights()
+      focusOnResult()
+    }
+  }
+

   let onChange: () -> Void
 
   private let vertexRegex = MapParsingPatterns.vertex
   let onChange: () -> Void
 
   private let vertexRegex = MapParsingPatterns.vertex


@@ -12,12 +39,18 @@ class MapTextEditorController: NSViewController {
   private let opportunityRegex = MapParsingPatterns.opportunity
   private let noteRegex = MapParsingPatterns.note
   private let stageRegex = MapParsingPatterns.stage
   private let opportunityRegex = MapParsingPatterns.opportunity
   private let noteRegex = MapParsingPatterns.note
   private let stageRegex = MapParsingPatterns.stage

+  private let groupRegex = MapParsingPatterns.group

 
   private let changeDebouncer: Debouncer = Debouncer(seconds: 1)
 
 
   private let changeDebouncer: Debouncer = Debouncer(seconds: 1)
 

-    init(text: Binding<String>, onChange: @escaping () -> Void) {
-    self._text = text
+  init(
+    document: Binding<MapDocument>, highlightRanges: [Range<String.Index>], selectedRange: Int,
+    onChange: @escaping () -> Void
+  ) {
+    self._document = document

     self.onChange = onChange
     self.onChange = onChange

+    self.highlightRanges = highlightRanges
+    self.selectedRange = selectedRange

     super.init(nibName: nil, bundle: nil)
   }
 
     super.init(nibName: nil, bundle: nil)
   }
 


@@ -31,10 +64,11 @@ class MapTextEditorController: NSViewController {
 
     scrollView.translatesAutoresizingMaskIntoConstraints = false
 
 
     scrollView.translatesAutoresizingMaskIntoConstraints = false
 

+    textView.backgroundColor = .UI.background

     textView.allowsUndo = true
     textView.delegate = self
     textView.textStorage?.delegate = self
     textView.allowsUndo = true
     textView.delegate = self
     textView.textStorage?.delegate = self

-    textView.string = self.text
+    textView.string = self.document.text

     textView.isEditable = true
     textView.font = .monospacedSystemFont(ofSize: 16.0, weight: .regular)
     self.view = scrollView
     textView.isEditable = true
     textView.font = .monospacedSystemFont(ofSize: 16.0, weight: .regular)
     self.view = scrollView


@@ -42,6 +76,50 @@ class MapTextEditorController: NSViewController {
 
   override func viewDidAppear() {
     self.view.window?.makeFirstResponder(self.view)
 
   override func viewDidAppear() {
     self.view.window?.makeFirstResponder(self.view)

+    updateHighlights()
+  }
+
+  private var textView: NSTextView? {
+    return (view as? NSScrollView)?.documentView as? NSTextView
+  }
+
+  private func updateHighlights() {
+    if let textView {
+      if let textStorage = textView.textStorage {
+        textStorage.removeAttribute(
+          .backgroundColor, range: NSRange(location: 0, length: textStorage.length))
+
+        for range in highlightRanges {
+          let nsRange = NSRange(range, in: textStorage.string)
+
+          textStorage.addAttribute(.backgroundColor, value: NSColor.Syntax.match, range: nsRange)
+        }
+
+        textView.needsDisplay = true
+
+      }
+    }
+  }
+
+  private func focusOnResult() {
+    if let textView {
+      if let textStorage = textView.textStorage {
+        if selectedRange < highlightRanges.count {
+          let range = highlightRanges[selectedRange]
+          let nsRange = NSRange(range, in: textStorage.string)
+          textView.scrollRangeToVisible(nsRange)
+          textView.selectedRange = nsRange
+        }
+      }
+    }
+  }
+
+  private func setSelectionColor() {
+    guard let textView = self.textView else { return }
+
+    var selectedTextAttributes = textView.selectedTextAttributes
+    selectedTextAttributes[.backgroundColor] = NSColor.yellow.withAlphaComponent(0.3)
+    textView.selectedTextAttributes = selectedTextAttributes

   }
 }
 
   }
 }
 


@@ -49,14 +127,13 @@ extension MapTextEditorController: NSTextViewDelegate {
 
   func textDidChange(_ obj: Notification) {
     if let textField = obj.object as? NSTextView {
 
   func textDidChange(_ obj: Notification) {
     if let textField = obj.object as? NSTextView {

-      self.text = textField.string
-        
-        
-        changeDebouncer.debounce {
-          DispatchQueue.main.async {
-            self.onChange()
-          }
+      self.document.text = textField.string
+
+      changeDebouncer.debounce {
+        DispatchQueue.main.async {
+          self.onChange()

         }
         }

+      }

     }
   }
 
     }
   }
 


@@ -86,69 +163,102 @@ extension MapTextEditorController: NSTextStorageDelegate {
     var matches = vertexRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
     var matches = vertexRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 1))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.number], range: match.range(at: 2))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.number], range: match.range(at: 3))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.option], range: match.range(at: 4))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 2))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 3))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 4))

     }
 
     matches = edgeRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
     }
 
     matches = edgeRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 1))

       let arrowRange = match.range(at: 2)
       textStorage.addAttributes(
       let arrowRange = match.range(at: 2)
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.symbol],
+        [.foregroundColor: NSColor.Syntax.symbol],

         range: NSMakeRange(arrowRange.lowerBound - 1, arrowRange.length + 1))
         range: NSMakeRange(arrowRange.lowerBound - 1, arrowRange.length + 1))

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 3))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 3))

     }
 
     matches = opportunityRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
     }
 
     matches = opportunityRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 2))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.symbol], range: match.range(at: 3))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.number], range: match.range(at: 4))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 2))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.symbol], range: match.range(at: 3))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 4))

     }
 
     matches = blockerRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
     }
 
     matches = blockerRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 2))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 2))

     }
     }

-    
+

     matches = noteRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
     matches = noteRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.number], range: match.range(at: 2))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.number], range: match.range(at: 3))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 2))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 3))

     }
 
     matches = stageRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
     }
 
     matches = stageRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {

-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
-      textStorage.addAttributes([.foregroundColor: NSColor.syntax.number], range: match.range(at: 2))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 2))
+    }
+
+    matches = groupRegex.matches(in: textStorage.string, options: [], range: range)
+
+    for match in matches {
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))
+      textStorage.addAttributes(
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 2))

     }
   }
 }
 
 struct MapTextEditor: NSViewControllerRepresentable {
 
     }
   }
 }
 
 struct MapTextEditor: NSViewControllerRepresentable {
 

-  @Binding var text: String
+  @Binding var document: MapDocument
+  var highlightRanges: [Range<String.Index>]
+  var selectedRange: Int

   var onChange: () -> Void = {}
 
   func makeNSViewController(
     context: NSViewControllerRepresentableContext<MapTextEditor>
   ) -> MapTextEditorController {
   var onChange: () -> Void = {}
 
   func makeNSViewController(
     context: NSViewControllerRepresentableContext<MapTextEditor>
   ) -> MapTextEditorController {

-    return MapTextEditorController(text: $text, onChange: onChange)
+    return MapTextEditorController(
+      document: $document, highlightRanges: highlightRanges, selectedRange: selectedRange,
+      onChange: onChange)

   }
 
   func updateNSViewController(
     _ nsViewController: MapTextEditorController,
     context: NSViewControllerRepresentableContext<MapTextEditor>
   }
 
   func updateNSViewController(
     _ nsViewController: MapTextEditorController,
     context: NSViewControllerRepresentableContext<MapTextEditor>

-  ) {}
+  ) {
+    nsViewController.highlightRanges = highlightRanges
+    nsViewController.selectedRange = selectedRange
+  }

 }
 }